From f0abae28b4f21093976496cd6288f0a96d7ab1f8 Mon Sep 17 00:00:00 2001 From: "sos22@douglas.cl.cam.ac.uk" Date: Thu, 10 Feb 2005 17:25:09 +0000 Subject: [PATCH] bitkeeper revision 1.1170.1.1 (420b98f5HLKkq19C9PxLpNFZOD2-mg) Make it compile in the non-crash_debug case. --- xen/common/keyhandler.c | 2 +- xen/include/asm-x86/debugger.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 571b76e59b..de83ae74cb 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -149,7 +149,7 @@ extern void perfc_reset(unsigned char key); void do_debug_key(unsigned char key, struct xen_regs *regs) { - debugger_trap_fatal(0xf001, regs); + (void)debugger_trap_fatal(0xf001, regs); asm volatile ("nop"); /* Prevent the compiler doing tail call optimisation, as that confuses xendbg a bit. */ diff --git a/xen/include/asm-x86/debugger.h b/xen/include/asm-x86/debugger.h index 74e8a82ef5..dc018f5bdb 100644 --- a/xen/include/asm-x86/debugger.h +++ b/xen/include/asm-x86/debugger.h @@ -123,7 +123,7 @@ static inline int debugger_trap_fatal( #define debugger_trap_entry(_v, _r) (0) #define debugger_trap_fatal(_v, _r) (0) -#define debugger_trap_immediate() () +#define debugger_trap_immediate() #endif -- 2.30.2